From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 8 May 2008 10:18:34 +0000 (+0100)
Subject: Fix the boot of ia32pae Windows xp guest (up acpi)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14215^2~50
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=84c8c8735bf9cc1416881b7937e80243c5453b8f;p=xen.git

Fix the boot of ia32pae Windows xp guest (up acpi)
  - X86_FEATURE_APIC should be in edx register.

Signed-off-by: Xu Dongxiao <dongxiao.xu@intel.com>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 209b1a64b3..cbf5212558 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1610,7 +1610,7 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx,
         *ebx &= 0x00FFFFFFu;
         *ebx |= (v->vcpu_id * 2) << 24;
         if ( vlapic_hw_disabled(vcpu_vlapic(v)) )
-            __clear_bit(X86_FEATURE_APIC & 31, ebx);
+            __clear_bit(X86_FEATURE_APIC & 31, edx);
     }
 }